gnomeos: Pull in vte/gnome-terminal

diff --git a/gnomeos/3.4/gnome-terminal-disable-docs.patch b/gnomeos/3.4/gnome-terminal-disable-docs.patch
new file mode 100644 (file)
index 0000000..07ea976
--- /dev/null
+++ b/gnomeos/3.4/gnome-terminal-disable-docs.patch
@@ -0,0 +1,44 @@
+From 16bf30bf14daa0dfbccdf23bca3d65394145e58a Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Fri, 27 Jan 2012 08:34:25 -0500
+Subject: [PATCH] build: Add --disable-documentation flag
+
+Useful for operating system builders to avoid build cycles, and
+also if one just doesn't want to ship the help files.
+---
+ Makefile.am  |    6 +++++-
+ configure.ac |    4 ++++
+ 2 files changed, 9 insertions(+), 1 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 27547fd..f96dffd 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,4 +1,8 @@
+-SUBDIRS = src po help
++SUBDIRS = src po
++DIST_SUBDIRS = help
++if ENABLE_DOCUMENTATION
++SUBDIRS += $(DIST_SUBDIRS)
++endif
+ 
+ NULL =
+ 
+diff --git a/configure.ac b/configure.ac
+index 407dc01..9ffee92 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -159,6 +159,10 @@ AC_SUBST([GTK_BUILDER_CONVERT_FLAGS])
+ # Documentation
+ # *************
+ 
++AC_ARG_ENABLE([documentation],
++      AS_HELP_STRING([--enable-documentation], [enable man pages and HTML]),
++      [], [enable_documentation=yes])
++AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes)
+ GNOME_DOC_INIT
+ 
+ # ****************************
+-- 
+1.7.6.5
+

diff --git a/gnomeos/3.4/manifest.json b/gnomeos/3.4/manifest.json
index ec4e14b1866a14c4c9883791a22e84a519649247..37a715738daf139f242f17cbf8e90395f38c2da7 100644 (file)
--- a/gnomeos/3.4/manifest.json
+++ b/gnomeos/3.4/manifest.json
@@ -693,6 +693,13 @@
 
                {"src": "gnome:gnome-panel",
                 "patches": ["panel-disable-docs.patch"],
+                "config-opts": ["--disable-documentation"]},
+
+               {"src": "gnome:vte",
+                "branch": "vte-0-32"},
+
+               {"src": "gnome:gnome-terminal",
+                "patches": ["gnome-terminal-disable-docs.patch"],
                 "config-opts": ["--disable-documentation"]}
        ]
 }

diff --git a/gnomeos/3.4/panel-disable-docs.patch b/gnomeos/3.4/panel-disable-docs.patch
new file mode 100644 (file)
index 0000000..cff9038
--- /dev/null
+++ b/gnomeos/3.4/panel-disable-docs.patch
@@ -0,0 +1,44 @@
+From fb914c20a21f62ba9a1e1f3c718bf84046bf0fe0 Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Thu, 26 Jan 2012 18:11:10 -0500
+Subject: [PATCH] build: Add --disable-documentation option
+
+Useful for operating system builders who want to avoid cyclic build
+dependencies.
+---
+ configure.ac     |    5 +++++
+ help/Makefile.am |    6 +++++-
+ 2 files changed, 10 insertions(+), 1 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 9b10a70..b5be442 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -22,6 +22,11 @@ AC_SUBST(LIB_PANEL_APPLET_LT_VERSION)
+ 
+ GNOME_MAINTAINER_MODE_DEFINES
+ 
++AC_ARG_ENABLE([documentation],
++      AS_HELP_STRING([--enable-documentation], [enable man pages and HTML]),
++      [], [enable_documentation=yes])
++AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes)
++
+ LT_PREREQ([2.2.6])
+ LT_INIT([dlopen disable-static])
+ 
+diff --git a/help/Makefile.am b/help/Makefile.am
+index 7d38ddd..688b08e 100644
+--- a/help/Makefile.am
++++ b/help/Makefile.am
+@@ -1,3 +1,7 @@
+-SUBDIRS = clock fish
++DIST_SUBDIRS = clock fish
++SUBDIRS =
++if ENABLE_DOCUMENTATION
++SUBDIRS += $(DIST_SUBDIRS)
++endif 
+ 
+ -include $(top_srcdir)/git.mk
+-- 
+1.7.6.5
+